Merge v1.21 into v1.x #1682
+31
−2
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.